From af29c1116d4f4725e03f25b269edfacbe03220f5 Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Tue, 13 Sep 2005 14:20:02 -0600 Subject: [PATCH] Converge ia64 grant_table API --- linux-2.6-xen-sparse/include/asm-xen/gnttab.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/linux-2.6-xen-sparse/include/asm-xen/gnttab.h b/linux-2.6-xen-sparse/include/asm-xen/gnttab.h index ab4871e663..aef955d2d4 100644 --- a/linux-2.6-xen-sparse/include/asm-xen/gnttab.h +++ b/linux-2.6-xen-sparse/include/asm-xen/gnttab.h @@ -18,7 +18,11 @@ #include /* NR_GRANT_FRAMES must be less than or equal to that configured in Xen */ +#ifdef __ia64__ +#define NR_GRANT_FRAMES 1 +#else #define NR_GRANT_FRAMES 4 +#endif struct gnttab_free_callback { struct gnttab_free_callback *next; @@ -63,4 +67,10 @@ void gnttab_grant_foreign_access_ref(grant_ref_t ref, domid_t domid, void gnttab_grant_foreign_transfer_ref(grant_ref_t, domid_t domid, unsigned long pfn); +#ifdef __ia64__ +#define gnttab_map_vaddr(map) __va(map.dev_bus_addr) +#else +#define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr)) +#endif + #endif /* __ASM_GNTTAB_H__ */ -- 2.30.2